Exclude CR2 files in the tiff loader.

svn path=/trunk/; revision=21115

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 29cead3c3a238e5f91722b598febd99f33e776da..ee9fd0f7904c03b6141354eddd91d07182d740d0 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-13  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 532644 – TIFF loader need to exclude CR2 files
+
+       * io-tiff.c: Add a pattern to exclude CR2 files.
+       Noticed by Hubert Figuire
+
 2008-08-13  Michael Natterer  <mitch@imendio.com>
 
        * gdk-pixbuf-marshal.list: reorder marshalers for no reason apart

diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 90a4ef817fad678d79f7f6bd27727f4b87a3b030..2f62f38d603b4c7f0b67dd2b879699b589bd45df 100644 (file)
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -797,6 +797,7 @@ MODULE_ENTRY (fill_info) (GdkPixbufFormat *info)
         static GdkPixbufModulePattern signature[] = {
                 { "MM \x2a", "  z ", 100 },
                 { "II\x2a ", "   z", 100 },
+                { "II* \020   CR\002 ", "   z zzz   z", 0 },
                 { NULL, NULL, 0 }
         };
        static gchar * mime_types[] = {